Fix tests && some minor PEP8-ish tweaks.
Kill some commented code from latest refactor.