Clean up cellClass setters and add tests