Progress on adding test coverage