Port tests to py.test
Use lists instead of tuples in examples

Readability, readability, readability.