Some basic changes to the tests
Merge branch 'update-tests'