Fix more test namepsaces.