DEPL-5302 Added some unit tests