GPII-802: Include universal acceptance tests