Update help messages
Fix failing test