Updated to use the ResultItem type and a bit of refactoring.
Yes, I know the test is testing for 2 things, but they're very much a unit so I'll allow it.