Made some additional fixes to the bundle to ensure test passage.