Some replacement in Main
New compare test