Added UTs ; Added comments