Moved tests according to the new hierarchy