Some slight exe test reorganization for better self documentation and debugging.