[#4624] Added more tests

- Used a data provider to allow testing the three various inputs that
  led to issues previously.