reorganize test tree to match source tree
parser combinator tests; fix combinator bug (dictionary access instead of field access) and make function names more consistent