Updating to make the package/war installations and tests work.