Buttoning up details & tests.