Add more tests for remote context