moved some more tests