Two more specs, and pulled some stuff up into root Traits
Played around with the acceptance test mode of Specs2