Improve presence tests.