add testing for remote instance too