GPII-20: Moved the default blocks to universal to allow one to be created for each testcase