Grant's tests and a couple updates
comment
Merge pull request #90 from HexSoftware/GTests

G tests