u/ reorganized, tests changed to use UI interface