Upgraded to Specs2 2.3.13, removed hackish dependency code