Added more struct tests.
Minor updates to some data types.