Added remaining combinators and extensions and tests.