Fix indentation of import statements
Make tests runnable by both py.test and unittest
Include UTF-8 header in all source files
Use consistent py.test incantation