Merge "Move CnapTest to match package name."