updated versions
repaired tests