Start converting asserts to self.assert*() so we get better error messages