Fixes for failing tests in quicktest