Added tests
Added tests