Last fixes for QUnit support