Simplify a few tests