Fix failing system tests.