Increased timeout/interval values slightly and added use-case checks
Increased timeout/interval values slightly and added use-case checks

Babalela01/MH-Tools,Babalela01/MH-Tools,Babalela01/MH-Tools,tsitu/MH-Tools,tsitu/MH-Tools,tsitu/MH-Tools,Babalela01/MH-Tools