Added more unittest