collapsed_labels -> last fixes for unit tests