Fixed unite tests, made some PEP8 changes.