Tweak orbit service and add test