Refactoring into separate classes
Refactored parser to support any nesting level of test cases