fix remaining instance tests