I forgot to mention that with the file names the way they are now, py.test does not run them automatically. That makes it impossible to correctly test this pull request.