Got coverage up to 100%

- Got coverage up to 100%
- Move some tests around so they made more sense
- Moved common code into test helpers
- Got rid of `clearTimeout` since we don't really need it

:bomb: