Nov12

Creating pull request for code review. See comments in diff.
We don't have any TestCell Entities.