Add the missing tests

This pull requests completes the code coverage for the current code base.