Reinstate Specs2 support (fixes #26)