Start refactoring of combinators + associated tests