(For Alex L) Added unlabel and updated tests.

@lopatin 
Ah sorry right, that's confusing.  I could just set it outside the outer if statement as a default.