Adding GridTest - so that it now works with the refactor
Merge remote-tracking branch 'origin/master'