Also update the test suite to reflect the recent changes

Signed-off-by: Petr Šabata <contyk@redhat.com>