Test cleanup: better package names