Increasing Code Coverage (88.5%~)