fix remaining tests, omfg