Improved the tests, correct the links