Refactor some feature specs

* Some of the specs had some duplicate setup