improve code coverage and fix some bugs
Merge pull request #88 from symfony-cmf/coverage

improve code coverage and fix some bugs