Fix some system tests.
Fix snapshot system tests.