Updated parameters here and there to run tests on local machine.
Added some comments too where useful :)