package upgrade
fixed/added waitFor tests