Fixing Unit Test