Passed tests with some changes to label* variant code