fixed incorrect naming on Namespace
Merge remote-tracking branch 'origin/develop'
fixed incorrect namespace on test