GRT Tests, and some tweaks to CITest