#158 improve tests
#158 improve tests
Merge branch 'master' into #154-Schedule