Fix remaining runtime tests