Merge branch 'dev' into newTests
Add tests
Add more tests
Merge branch 'newTests' into dev