Added more tests
Added dependencies