Fix Failed Unit Test