some unittest fixed