Refactored tests structure and revised Model contrtuctor tests.