Added CellState
Added test classes