Make the tests not depend on gsf.
2 files changed