Added user welcome page tests
fixed merge conflicts