Fix scaffolding and update tests to pass coverage.