Split checking the output in multiple checks instead of one big one

This because the order of the dict sometime changes and causes the tests
to fail. This should avoid that