Fix some more system tests