bulk upgrade : new test routines and better organization