Restore test suite to match new responses