Updated libs to 2.5.1-pre.9 and fixed failing tests (mostly)