Added guard, moved spec to conform to expect topography.