Added more tests and examples