fix remaining unit tests