removed libs
refac and tests added