Adding external test case. Removed some dependencies on remote-client where we didn't need it.