The way the expected object is constructed is horrible, just use
plain fluent builder without the extensions. This makes it more
clear and much more concise.
Change-Id: I042dfda9fadcc2b3764a449dfc34300f0928370b Signed-off-by: Robert Varga <robert.varga@pantheon.tech>