simplify tests to use struct equality rather than a seperate assertion for each field