Simplify test logic to the point where I can trust it.