ENH: Now PEP8
ENH: Now test actually tests what it should