Add UTs

Add some util tests