Refactor spec setup to be simpler