Add contact and refactor tests