fix remaining unit test