DNN-6136 Add more Unit Tests