Bug: fixed tests for Data.bin after refactor