Minor updates to get tests to pass and up test coverage.