Small additional assertion added to fold tests
Refactored and tidied combine tests, and fixed bug exposed by this