Add CharmTest. Refactoring entities