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