make tests work, rename combinators