Make tests work with py.test.
Remove commented code.
Merge pull request #2 from voyager42/fix-tests

Make tests work with py.test.