Add reload, with tests