Fixed remote exception and added unittest to show this is already fixed