refactored cell tests