Fixed failing tests

There were various issues with the tests, I later found out
that the original author hadn't written tests for havana
This now finishes ./run_tests clean

Closes-rally-bug: DE1186
Implements: rally-task: TA8264
Not-in-upstream: true