Cleanup input definition tests
Cleanup parsing classes and tests