Add defaults to both development and test environments