Update spec to wrap around when finding next