Update concreateTestGenerator and solve the ordering of required mappings for a test

Related data structures like Mapping are modified