bring tests in line with auto-zxy