Support package and source install. Improved testing.