fixes so the tests will run for a brand new repo

Change-Id: I57feb00cbe6645075cca26334d46ba607e2344b0