Adding Usage Parsing Unit Tests, Refactoring