Fixing tests
Linking stuff