Less brittle tests, ensure no false positives