Added remote handler tests. Minor updates.