Fixing formatting in Welcome.html and fixing some unit test mappings