[SAHI] Fix for Bundle test and Drift Management