Adapted to newest libs
test