Refactored configuration spec so that it has clearer expectations