Snapshotfixes. (live-tests)