Fix Bug 913704: Tweak GA, Implement Changes From Gareth

Removed test code.