Added some UTs