Simplify test a bit.