Fix the Unit Test