Hotfix: Fix more simpletest.