fix remaining tests