Extended the tests