Add test for ValueLabel and correct bug accordingly