Some fix with qtest