Add/fix test coverage