test: Remove swp files. Rename files.
test: PEP8 fixes and moving files around.