Fixed some testing errors