Updated tests and files in models to use new structure.