Modifying the "Reduce ITP with number of active tests per user"

Modifying the "Reduce ITP with number of active tests per user" #2001