Refactor tests, all passing.
Copy last 2 tests for other 4 cells. 4 test failing.