Scoped all test files. Moved some tests around.