DNN-6136 Add more Unit Tests
DNN-6136 Add more Unit Tests