this should be the last fix to make the tests green. next: fixing ui tests