collapsed labels -> more unit test fixes