Added Unit Tests to Solution

Renamed and stuffs.