Added expression hasher, code cleanup, parser test