This change avoids some nasty import issues and also ensures that the right code is tested and arbitrary code is not included when packaging.