fixed tests
fixed str combinator
and some test