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