Minor test enhancemant to imporove code coverage