Remove comments and fix test message