More tests and first attempt at blocking double updates of GO and PCI