add <g|| and >g|| parsers, reorganizing core testf