collapsed labels -> minor tweaks to finish up tests