fixing the arguments and adding few more tests