1) Unit Test Fix