Automated test coverage and further grid fixes.