- Refactoring abstract entity classes;
 - Refactoring tests;