Moved test out of files
Made test.self be tested last without setUp and tearDown