Fixed some unit tests