Contacts, tests use new tables; contacts migration fixed