GPII-434: Fixed SPI Settings Handler unit tests so that they no longer corrupt the desktop. Improvements to commenting and logging