I think I have settings working now

Cleaning up a bit in the tests, hopefully travis wil work now.