Fix two more system tests.