Increase code coverage in existing modules

Not all the existing modules have a 100% code coverage. This is mostly due to callback functions that aren't executed while running the unit tests.
The benefits of this being that we don't need to keep remembering to set up sinon and tear it down.