More circuit blocks in GP, minor changes to Test