Andrew/Brain: Fixing more functional tests for user settings