some changes to fix up testing errors