Add defaults settings + Correct a test