Cleanup and fix broken spec.