Fixed some unittest issues