Improve specs and add guard