make code better organized
improve test final message