Unit tests of model and data layer done