Added Random UT, fixed bug that was found with it