Complete all POJOs and tests. Code refactoring.