fixing tests

Did not properly cherry-pick the relevent tests

Closes-rally-bug: DE1186
Implements: rally-task: TA8264
Not-in-upstream: true