Fixed some unit testing checks