Faster Tester execution through mutliple windows users
Move XpandNavigationItem to base
minor updates