Update tests for new data structure