BUG: fixed PEP8 stuff and fixed test names