Spec and test. Spec work started in #422.
Spec and test.
Spec work started in #422.