Bug 1254 - Increase UT coverage