Fixed some of the last tests, all remaining failing tests fail because grid is not defined.
Merge remote-tracking branch 'origin/master'