Adding tests, fixing combinators