all test added; lib issues fixed