added some unit tests + changed parser