Shashank,Aravind | #237 | Moving unit tests into unit folder