Some unfinished improvements.
Merge branch 'master' of https://github.com/swinter2/GATest