minor + unit test/behat fixes

Hi Zig,

Please apply my minor + unit test/behat fixes.

Regards,
Tim