Improved code coverage to above 50%.