Fix tests but having problems with GCD behavior