Fixes and cleanups

There is still a problem running the tests using tox, it can be some
sort of dependency issue from my side, but rest assured, running
plain old nosetests works like a charm.