tests: Minor cleanup in monkeypatch module and tests

Change-Id: I7d1d10c8b1e97d7d28af31d25fb1fe0fdcd8d8d5
Signed-off-by: Nir Soffer <nsoffer@redhat.com>
Reviewed-on: http://gerrit.ovirt.org/20202
Reviewed-by: Allon Mureinik <amureini@redhat.com>
Reviewed-by: Dan Kenigsberg <danken@redhat.com>