Changes in 2 test classes

Hi,

please have look these changes and check whether they are useful for you.

Thanks, Tai