Moved the test files to the model subdirectory, too