Fix failing system tests (from Chozen update)