more work on test coverage and impls