Update Tests structure