New Entity\View handling. More tests. Refactoring tests to use instanceof.