Trying to do test fixes

Change-Id: I4fa74cefc82c3e3ae08a560253cc80bb1a45dcac