Added Tests
Merge Conflict