Finished cell spec
Merge branch 'feature/tests' into develop