Fix broken welcome page and associated tests