Disable system messages
Fix unit test