Adds back in waitFor() call in map focusById test to prevent state problems.