Update and rename test to Main