Fix UI and tests