repaired tests
fixed names on some places