more refactoring
more refactored tests
Merge branch 'master' into acceptance_cq
make test re-runnable
Merge branch 'DS-1008' into acceptance_cq
sync the Gemfile.lock
Merge branch 'acceptance_cq' into DS-1008