added parser test
added parser tests
modified tests
refactoring