add unmix() method
refactor
reorder tests an use unmix