make tests more concise

With some helper methods in a dedicated client our test get much easier to read and write :)