scope tests done
Merge remote-tracking branch 'upstream/feature/163-test_coverage' into feature/163-test_coverage