Reorganize a bit spec.
Organize specs and pass tests.