Added more qa tests