Moved some more tests