[UPDATE] lib, tests.