fixed tests and issue with '/'