refactor cell tests