Complete unit tests in the DM and the REST client