Refactored waiting tests to wait for a shorting time frame.
Refactoring method names of native tests. No logical change.