Refactor the project to add code coverage