Remove cellClass property and add more tests