Reorganize tests according to recent changes (move the tests to their right directory)