More machineC test fixes