removed deprecated tests, and made the existing ones run again
Merge branch 'tests' into dev