improvements to parse.py; reduced the number of test files