Refactored Connection specs.