Fixing bug in lean bundling strategy, a couple of renames for clarity, and re-enabling all tests