First Draft of the Unit Tests
Merging from the Repo