Fix test file names.
Fix utils-test ns refs.