Improve Test command