Added more QA tests