Add some examples, remove benchmarks form test suite. Some other updates