Finish tests, correctly namespace the rest of the tests