Better naming of variables of testsource