Fixed the classical QA tests