Why are you moving all those tests? I don't think that this is necessary.