Test file modifications

Two tests added. Smal fixes in library source