Test fixes now that the root is a package

Change-Id: I91e5361f5ed3a4c0b91001b443b1e024d076a971