Cleaning up tests and adhering to PEP8 in models