rearrange initialization so that 'make tests' doesn't require X