Fixes unittests and adds link to the basket.