Add tests. Fix links of variables