More simplification of repetitive tests