fix 3 issue with satellites, add tests