Unit class with tests
REVIEW
after REVIEW edc7587
Merge branch 'feature/UnitClass' into develop