Revert "+Test Settings"

This reverts commit 2dfa0a7ce859bdae77f90ec7a046a72e12900aa3.