Restore fix for #233

Migrating all tests from QMTest to pytest I accidentally removed the fix/workaround for #233 (closed) (basically because I thought it was not needed anymore).

This MR restore the fixes.