Add more examples and correct tests