Moved code coverage from 37% to 75%