Updated goal names in tests