Ensuring all code is covered

With this commit I have 100% code coverage