Updated to latest libs and fixed tests