Simplify some test code