Refactor configuration specs