Tests all passing with local
Refactored tests for local and remote
Fixed tests
Moved local and remote imples
Moved local and remote impls