Refactor spec based on new layout.