Spec fixes.
Improve spec coverage.