Changes to for test result optimization