Updated UTs. Removed copypaste