Use new exceptions
Fix tests to use structs