[SERVDEV-49] - Added tests