Fixed a few QA tests