add check for the labels
remove unused change handler
add check on the tests