Added more examples and tests