Fixes for postprocessing & more changeable tests.
Still not sure about this behaviour. 'll check it tomorrow.