refactored test setup a bit
Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/analytics/user-metrics-2