fixing 3 assertions