Address code review comments

- clean up comment wording
- fix potentially leaky tests