Add Settings with tests