Simplify some tests