Added some tests
Added some tests