fix pass/fail checks and messages