Fix broken tests due to new objj type checks