Added tests
Fix some of the tests
All Tests pass now.