Fix review comments to make data structures clearer in the tests