Add Struct and Binary to auto-tests