fixes for the examples
More tests