Additional tests on truncation, including dancing between packages.
Merge branch 'master' into cache_improvements