Updating tests to match contacts/ changes, fixing buglet found by tests