fixing integration tests broken by ui restructuring