changes to tests to enable GCE to work