Fix link and test errors