Merge branch 'feature/unit-tests' into develop