Improved tests.
pdf converter, corresponding tests
fixed conflicts