Added more tests
Minor doc updates