Fixing up assertions