fixes from code review
unit test of remote helper passes all tests