Finished grid setter tests; Refactored after a code-review