Fix more system tests