move tests into the right namespace