Bug corrections for fault tolerance, tests improved - Mario