Start of making structs test cases work