Big refactoring of tests
Merge branch 'master' into nunitSupport