add remote resource test refactoring