Added Tests
Tagging finalized