Library fix and test is working properly