Made tests a test suite.
Merge latest changes in branch 'master' into dev