More specs and tests.