fix tests
cosmetics
Merge pull request #319 from doctrine/fixes

Fixes