Adding differentiated tests
Merge branch 'master' into workshop