promote from brownfield; fix up and add tests