Fixed settings and browser test cases

What do you mean? You want me to merge it back or it is already there?