Update tests for new label convention