Fix for sometimes returning Complete instead of PASS/FAIL/UNDEFINED