Merge fixed lib/tests