Added more UTs