tests: Fix the test suite

The last cherry pick from 3.3 wasn't updated correctly, and some of the
tests ended up depending on a module that was merged into another. This
has been corrected now.

Signed-off-by: Gergely Nagy <algernon@balabit.hu>