Merge "[33/n] Remove redundant spyOn()" into main