Add first tests
Merge branch 'master' into Wuisch