minor fixes for parsing regression tests,
removed refactoring code (totally not working)