some shuffling around to get test system up