This pull requests brings test coverage close to 100%