parsing test done - bugs fixed