Improve specs, add a helper