* Dumptester changes / fixes