Fixed parser errors and added simple test files.