Some changes in "Main" and "Test".