Fix tests because of IDs that changed on test repository