refactor to prepare ag test
more wait after waiting process
prepare to test
improve ag test