Fixed some testing