Added thank you test and fixes based on test of other tests