Change tests to reflect new struct