Added remote tests and cleaned up code

- Added remote tests for track data / fixed one
- Refactored some code network_merchants so useless data is not sent
- All remote tests pass

@j-mutter @jnormore @louiskearns