Tighten up logic and tests.