Refactored Contact Tests