Fix system tests.