Further work on cuesettings

Now passing all Cuesettings unit tests, when using the revised tests