Change test package to sbt convention.
Minor.
Cleanups.
Add specs2. Not working yet.
Fix heading.