tests
pep fixes
syntax for 2.6
Merge pull request #53 from praekelt/feature/tests

tests