Update and rename test to Test