Added more tests
More documentation and tests