Write tests for remotes controller, remote features, and remote model.
fix merge conflict