added parser methods and tests