Added some tests for examples, still need some more.
Merge remote-tracking branch 'origin/master'