Refactored tests and test models