test: FAIL_IF & ASSERT cleanup