Moved more tests