Removed dependency on (refresh) and also added correct imports to unused-as-now test suite.