Merge changes I06df032d,Ib923de28

* changes:
  Settings: Disable failing tests.
  Settings: Fix assertThat in tests