Added some tests
Final Touches