Updates to spec setup