fix tests, minor update, move to development/python-modules/ (cherry picked from commit 9a10c55a8a)
9a10c55a8a
svn path=/nixpkgs/trunk/; revision=15707
svn path=/nixpkgs/trunk/; revision=15104