Merge branch '1016-refactor-test-framework' into 'master'

Resolve "refactor test framework"

Closes #1016

See merge request !1021
39 jobs for master in 21 minutes and 19 seconds (queued for 18 seconds)