Add assertFalse and do some other minor corrections