moved some tests
moved some more tests