Moved some tests.