tests repaired
version of 2-opt added