Fix more optional tests