fixed parser tests
cleanup, bug fixes