Restored TestUI and fixed scenario tests