Snooze: bug correction for fault handling, test output improved - Mario