Do we have tests for this?

Also, can you take out the swapping to use the disallow value stuff and move it to a new PR? Its not really necessary for the other feature and I'd like to get that moved through faster.