Added --mask-adapter option that adds 'N' instead of removing adapter (and test_mask_adapter)