Correct tests; simplify the cell test