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