Fixed minor test issues with coverage