Settings service improvement

Cleanup of test code.