modified the tests and the examples