Fixed some testing changes