Merge changes Ib9c5e3f5,I4104d202

* changes:
  Clean up rollbacks after each test (2/n)
  Rewrite and re-enable the test (1/n)