Increasing code coverage by adding some missing unit tests