Add combination split tests, and more support for combined splits
Get tests working