Fixed broken test due to new data structure