Started to improve code coverage