Updated unit tests
Matching numbering corrected
Base analyzers added