fixing unittests, so that they validate again