[UPDATE] finalize lib and tests.