Even aligned labels, tests fixed