PEP8
Refactored nosetests a bit to be less noisy and run at a decent clip