A few more tests and updated documentation added