Switched parsing method and removed unsupported tests
Fixed TBD implementation