Fixed UG-1253 Test and UG-1403 Test