Improve the orbit test