Put all examples in the same file and cleanup the tests to use the new names.
Try to find better (=more in sync with the rest of the lib) naming. My guess is that these are better, but YMMV.