Updated to Specs2 requiring some specs updating

Fixed issue of non running tests.
Fixed bug in depreciated $within dsl