Merge branch 'ab/pack-tests-cleanup'