Fix the bundleCharms method and provide unit tests.