refactored tests on all models