Fixed a few failing tests for the satellites