Update output message for simulate
Add seconds support and store diagnostics for ANALYZE
Fix tests so they pass again (they weren't updated to reflect code changes)