Going forward with the specs2 upgrade
Fixing identation
Fixing spec that failed after specs2 upgrade