Add better assertions in the tests