Needed to tweak to keep gaiatest.