Updating test runner and removing few waits