Remove unused imports.
Fix validator messages.
Add tests for exit code matcher.