Added Tests & Made sure they pass
Code Cleanup