Dat tests
Minor changes
Merge branch 'feature/tests' into develop