Rollback regression test

#15016 was missing a regression test.
This adds a regression test for it, and refactor the other tests a bit as @chancancode suggested 

cc @rafaelfranca @jeremy