Updating labels, adding tests