fix remaining errors in tests