Adding lib and tests