Improve Test coverage and Code Climate score.