Fixing and Adding tests for the new local charm upgrade paths