Add improved combinator-based version of ABC model test.