adapt tests to new data structure