Fixed #20550 -- Added ability to preserve test db between runs