Revert non-test parts of r188507

Re-add the inboundsless tests I didn't add originally