More fixes for tests and configuration.

Change-Id: I694fdc6812623e26b9f75f1d7744e15074e29517