Add code to test should welcome message and also refactor test code