More descriptive spec names.
Removed TODO and placeholder test (which no longer applies).