Fix name parser issues for unitests