Increasing code coverage

Now we have 68.3% code coverage