Move test support under spec, and add code coverage.