fix more data tests