Move misplaced test under the right package

Change-Id: I3c0c78cb315362f4f2948be91e23685495824b73