Fix broken test from master
Fix another failing test on master
Some specs for Settings