Adapt tests for popupdirective to new focus handling