[wip] Update integration testing stuff

This is still not working as expected (data integration test not udpated yet).