Merge "Unit test improvement - Fixed dealy replaced with waiting function in one...