simple starting tests
Merge branch 'master' into master-remote