Improves tests, provides explicit message for time out. Moves imports to the top of test file. corrects a typo in comment.
Improves tests, provides explicit message for time out. Moves imports to the top of test file. corrects a typo in comment.

SahilTikale/haas,CCI-MOC/haas