Add rendering tests
Merge two dev branches
Complete merge
Remove useless directories
Replace "basic" renderers with JSON-look adapter