renamed some parser methods, added tests