Fixed test using Contacts due to Refactor

I have fixed all non-contacts tests using Contacts due to Refactor