Simplify spec setup a little