Fixing invalid dependency
Adding more tests