fixed tests, path disorder