Outline some tests
Organize/refactor analyzer.