Rewrote test suite to work with nosetests