trying to pass the unit tests : more fixes