wip: More tests / updates for handling remotes