Fix tests and implement remote parameter