moved some tests to correct folders