Clean up spec "describe" blocks for consistency