Minor changes
Merge branch 'feature/unit_tests' into develop