Simplify spec setup a bit