Updates. Trying to fix Google test.