Make success criteria more specific. Make unit test output less spammy.