Improve Test2