Move test helpers around
Fix up the Flyout tests