Missed a test dependency
Renaming some packages