Simplify some test code.