Add some more assertions