Some changes for tests and testing.