Add some safety checks
Add route which went missing during rebase
Make testremote more robust