correct empty struct test; more shorthand
4 files changed