Fixed import errors in tests