Apply test result fixes