Split extensions and combinators. Added more combinators and refactored the tests.