readding test cases from old test suite
Merge branch 'master' of https://github.com/andrewchambers/g