Move to standard test namespace names