package changes to fix auto test issues