fixed tests, fixed urls