moving things around, fixing globals for ui tests