Add more assertions