Fixed errors on GWC tests