Correted UT Coverage Issues