Make tests pass, and prepare for contacting feature.