Unfudge / fix "of Type" related tests