Merge "Changed mocking function due to WrongTypeOfReturnValue exception" into main