code cleaning
Moving back some Opposite Tests
Bug fix