Improve coverage

Feel free to merge.