changed name to follow convention
updated test details
Merge remote-tracking branch 'origin/experimental' into experimental