fixed tests for the new data structure