Fixed tests in cell class
merge