Committing rest of changes for tests.