Adding more logical tests.