Updated to gmock r501