Added tests
Added more tests