Get Code Coverage up to 90%