shuffle things around to get tests work again