BS-1379, make transient data persistent to disk
fix test that depend on current version of engine hard coded