fixed tests and links behavior