Fix code for creation of testunits