some updates for test.0xdata.com fails