Fixed dependencies
Added test cases