Final version of the test mapping