clean up the pass/fail logic, still return the same value from test if it fails