Adapting test to compile with new toolchain and new data lib