clean up parser
test naming scheme change