Verifying format of the DRY unittests
Fixes for the tester + some tests