testsuite: Fix some regressions

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Merge pull request #66 from stgraber/master

testsuite: Fix some regressions