Add tests and update links