fix remaining test compiler errors