Update labels, add tests