Update a few examples
Work on tests