fixing rest of the unit tests