Make tests build again (fix linker issues)