Adapt existing tests to changed signature of some methods

Signed-off-by: mulhern <amulhern@redhat.com>