new version of data plugin + fixed tests