Adding the fixtures to the test org reference
cleaning a bit the links