Rather than complicate these tests, add new ones. =)