Pack-scan changes

self.assertRaises preferred slightly, though we aren't consistent about that.