fix remaining struct tests