renaming test files and more updates to models