Make test code simpler