Fixed two QA tests