Improved assertions to make sure the result contains all the right values