Update settings specs.
Keep test cases independent
Update internal specs regarding clean_single.