Refactor more specs.

Almost done...