Extended the Test Client