[bugfix] reinstate combiner option
[bugfix] update specs to Specs2