Pkg2 -> Pkg in tests

(also fix indentation)