Fix for compatibility with Q 0.9.2

This address the issue of the double wrapping of the arguments
and a minor issue in the test