Merge "Change struct offsets tests"