Some package renaming in tests (for consistency reasons)