Adjust GTs in tests