Fixed criteria unit tests.