Refactored the test to match the class