Simplify a couple of tests