cleanup stop, move xd shell bootstrap to test fixture