* completed prettifier generation
* extended tests