Fixed Existing Unit Test