Fix links' generation
Update tests