PEP8
remove cruft
added a test that shows how fucked up is our test infrastructure... fixing it tomorrow