More tests and scaffolding. [ci skip]