Try to fix remaining tests