Rearranging namespace loading for tests