More testing and improving the examples